* lisp/subr.el (sit-for): Don't run input-methods.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 335a3397deac9d431de969e5d336ee43b93e5e68..e23437e4a5fe37d300630541b2130de3768d342c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2014-05-29  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * subr.el (sit-for): Don't run input-methods (bug#15614).
+
 2014-05-28  Glenn Morris  <rgm@gnu.org>
 
        * cus-start.el: Fix some :version numbers.

diff --git a/lisp/subr.el b/lisp/subr.el
index 48cb33f098b4df59a00f01d8288ad8accc65f27c..0a95cebd1a66eac45428e4eb63ac902fc3bc9cb0 100644 (file)
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -2168,7 +2168,12 @@ floating point support."
     ;; FIXME: we should not read-event here at all, because it's much too
     ;; difficult to reliably "undo" a read-event by pushing it onto
     ;; unread-command-events.
-    (let ((read (read-event nil t seconds)))
+    ;; For bug#14782, we need read-event to do the keyboard-coding-system
+    ;; decoding (hence non-nil as second arg under POSIX ttys).
+    ;; For bug#15614, we need read-event not to inherit-input-method.
+    ;; So we temporarily suspend input-method-function.
+    (let ((read (let ((input-method-function nil))
+                  (read-event nil t seconds))))
       (or (null read)
          (progn
            ;; If last command was a prefix arg, e.g. C-u, push this event onto